Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 9 Sep 2010 06:51:50 +0000 (06:51 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 9 Sep 2010 06:51:50 +0000 (06:51 +0000)
commit7bab7da2b6e048e6bf972a8361e622b276a5b203
treeef5d795037b7a1f2a96cfc0049927917e581d8a0
parent902b4a933c3cd9c692685e602a01389b62092a75
parentd8830523cdff44d4ab4548cf07d8e9e078bd18e4
Merge from mainline.